Merge commit 'upstream/1.3.6'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:55:46 +0000 (01:55 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:55:46 +0000 (01:55 +0100)
commit5037b00c61f18bbcc5d73b2facb01dc41dccd924
tree5b43500c0eb0be0b78dcceaf5db4bf6616bb2744
parent7833d7f0bdfdef7b56d63a3d2199e852e8a95831
parentca9f74c56dc530d0fcda2258fe2468dbc576c483
Merge commit 'upstream/1.3.6'

Conflicts:

Makefile.in
xmldoc/babelmain.xsl